Merge changes from emacs-23 branch.
authorChong Yidong <cyd@stupidchicken.com>
Fri, 16 Jul 2010 15:45:58 +0000 (11:45 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Fri, 16 Jul 2010 15:45:58 +0000 (11:45 -0400)
commitfac02871f59445713fef074c6a72497c9ddcebb1
treecbf97f7b370d123b5ef44ba1a80711d79042b6be
parentc7b419c2e257f130fd98f02d48c81469957be1ee
parent6ad25ce489a0c74d5547587e19e037448991c218
Merge changes from emacs-23 branch.